Merge changes from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:49:43 +0000 (16:49 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:49:43 +0000 (16:49 +0800)
commit1c4d96da0ff9d916eafd2a692826e782aa21a28a
tree8b83d2c54cc0b73e4af9245135dbfb0f583eed5f
parentf22f53e3fbe9e5fe675f6d92d44d3768bff99b66
parent05b222b19d1438cbcb48b9bafbe1c82cbe4ed251
Merge changes from emacs-24 branch